merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 17 Nov 2010 04:09:08 +0000 (13:09 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 17 Nov 2010 04:09:08 +0000 (13:09 +0900)
commitf0718c141619813caffa7b849dabfef8ff1519de
treea14efd4c8282501a9590097dfb6ea2e9d4c96770
parent3565139946c18575d834499eaf68d246b1f538ec
parent3cbbd1c570fbb39dd5c291aa2e202cea79e1031c
merge trunk